Added name field to category and tag