A method for managing an Unmanned Aerial Vehicle (UAV) is described. The method includes receiving a flight plan that describes a proposed flight mission of the UAV in an airspace; adding one or more predefined points to the flight plan to create an enhanced flight plan, wherein each of the predefined points is associated with a set of conditions and a set of locations; and transmitting the enhanced flight plan to the UAV for storage of the predefined points on the UAV while the UAV carries out the proposed flight mission.