Added categories manager, updated other classes.