Removed dependency on Singleton<T> framework