Add dates before validation