Switch to Moment.js lib