Updates to include new date-based constraints