Add pk's and defaults for dates