Fixed models to work with new abstract model