added category entity, made baseEntityClass generic