Minor updates based on new data dictionary