Again changed enums syntax (:P)