Updated Models, DataFiles, Constants and Exception Classes