Enhancements & compatibility with Claromentis 7.2+