fixed category model, changed factories