Changed to use @Singleton