second round of chaning the new mapping model
Third change to the mapping model
Merge branch 'master' of https://github.com/sindremb/cloudbrokermodel