With category and comment