Madhuka: Prevent the breaking of a Singleton Class Pattern