Update to leverage Date object