Fixed models, added category model