More work on BC integration (#351)