More work on the Add Data section