Added nesting of categories