Fixed mapping model for 22 to 23