Improved Controller singleton pattern