Expand service input types.
Update the example