Category support added