Added support for the new version of the Coordinaiton Pattern model