Add support for some more comments