Added fixes for service entrypoint