add date support and update ID property field