Add $currentDate support