Moved enumerations to separate files