Adding proper Enum parsing