Changed datapaths to use openstruct.