Added/modified MapCanMoveTo/MapCanMoveFrom