Services instead of Config
Merge pull request #572 from DoneBySimon/patch-6

Services instead of Config