updated model with cml
added parsing of types, enum