CLDCONNECT-1162: Refactoring to a transformer based approach so that backwards compatibilty can be maintained