Moved @Singleton annotation from interface to implementing class