Add option to include custom date