UpdateMap handled now
Stuff is exported from module now