Added proper date support