Refactoring API to passthrough the targetDomain