refactoring DataService replaced by ToiletService