Bugfix: singleton abstract only handled single singleton instance, not single for each class name. Fixed.