Improve comment api