[WIP] Exchanged service definitions to make use of the ExpressionLanguage

This WIP PR tries to catch up with the latest service additions made by @adrienbrault