Modified implementation to call external service

Change-Id: I7fadb0dd5cf9c0fa832ef7efcb739cffbb302d50