Added core date support