Flight HasLifecycleCallbacks
Moved logic to services