Fixed old mapping model from 20 to 21