#13 Updates to services