Another change to datafeature structure