Added maps for self and AvailableToMove