Added map and enum support on model extractor, and added examplev2 test
case.