Modeling with Enriched Model Driven Architecture