Added world and area matching