added date support