Updated services, closes #10