Add data for finals and null flag