Added new subset2 module that only maps points (and mapping must be redefined if points change).