Initial version of MAP model
Merge origin/master