Add first implementation for comments