Add flow type support