Ironed out more of the data contract