Added full support for categories