Add basic infrastructure to keep comments