Extended comment support WIP