refactoring model for PropertyMapping, MapMapping and Iterable Mapping

See #200 and #157