Added moment back in to support custom date formatting