Updated specs and changed the enum to be class