Fixed models to new format