Changed enums syntax, fixed enums small bug.