Merge with the changes of map separation