Updated for date helpers