Added support for generic singleton service instantiation and registration