Finished and tested the adding of ExtendedData