Added function category management