Canonical mapping update
Mock Services added (SOAP UI)