Added missing module
Make Controller Singleton

Required to support windows