Change Engine to Singleton class