Removed dependency on soa-model, replaced with XQuery