Updated categories management