first round of changes in new mapping model