Adding enums parsing and support