Changed moment.js implementation