Update for moment.js