Updated models, exceptions and data files