Issue/singleton

Fixed the Singleton pattern.