Added flight task and group improvements