Added Features for Category and fixed bug