Update service model since 7.3

Model service has changed in 7.3.
This commit will handle these changes.

And by the way, you should rebase your branch against the gitlab master :)