Service mapping fix

I've changed the services so that they give an array of service mapping keys, instead of the single service mapping key.