Model mapping

Atamas commit