Added default date handiling