Added weekday support