killed some enums...
refactor the name to API