Adding Support for moment.js