progressed with models, rules and mappings