Add singletonizer class