Added Comment_type functionality