Updated a number of the file formats to use the new base class