Added a singleton class