Added contexts to services, for use with persistent connections.