Add a helper class to be able to use the service date rather than the local time