Add outer class for fix inner singleton class