Adding more features to default CBi/HB config