Add initial support of comments