Updating API to return the appropriate data for comments