SWITCHYARD-1555 - Updates to BPM and Rules