Fixing API for comments