Avoid static methods so we can mock it

[paulononaka]

Hi. I was wondering if you could make it to use class methods instead of static ones, so we could mock it on Unit tests (perhaps using Singleton pattern would help?). Thanks.