Rewrote all enum definitions to avoid wrong values