Adding category specificity to some of the APIs