Update enums style to make it easier to use