Modified services to be stateless.