Add date expansion