Add service call architecture