Added partialy categories management