Enhancements to Job CMP