Removal of enum way to make singleton objects