Changes to adapt to BPMS