Updated the grammar to reduce the coupling between service, it's inputs and outputs.