Refactor: Use the relevant GameMap function instead of the helper macros