Updated after Data interface change.