Improvements and additions to POCM.