Further work on mod/map