Update formatting and add fields