Changed all containers to Singleton