Preliminary work on smpmap replacement