More improvements to category model