Moved more enums to common