Added modeling for comments