Use new weekday enum instead of constants