- Added support for singleton and an example class