Now properly creating the expected data object.