Improve service pkg and request context handling