Removed all enums as they were moved to a different package