Separated model related methods from map view
Merge branch 'master' into gh-pages