Further improvements to passing the reference date