Changed the moment service from a factory implementation to a value implementation