Improved Date class