Added init methods and fix with flight find