Added support for enum based parsing
Added additional parsers