Changed communcation to use a service