Added category and comments