Updated to build data struct