Further work on Service and DataGetter.