Added categories to current CDI commands