Modified services specification. Closes #6.