Update BFQ to v6