Working on comment/remark support