added UnitHandler, modifying enums