Made the service enums a bit more succinct.