Properly export maps