A separate map would be best. I'll switch to that before merging.