Added BFF/BFFs formatting