Make dates optional