Fixed comments for entity returns