ECL-49 - Finalized the service mockup implementation