Got rid of singleton classes