Feature/improve comment api