Improved compatibility with different maps