Swapped to new GenericService database services' interfaces