Various Changes to Accomodate File Format Changes