Added handling for retrieving comments