Added support for reading comments