Check for domain object improved, flightplan added