Added all methods and attributes for the singleton classes