Fixing map structure of this branch