Added NullObject, Singleton classes