I was not so sure about this change as well :(
I have a different solution now, that does not include singleton or any other static properties in this class.