Added minification support for singleton