Added comments and relationships for comments