Add support for retrieving comments