Adding BFTask support