Bundled some enums with their own ussages classes