Singleton and Builder patterns added