Renaming/adding some fields, updating script