I moved all enumerations into inner-classes