refactoring of mapping schema
Refactoring of DSL