Added categories and groups managemants