removing enums, adding item for inheritance, moving hashmaps to concrete classes