Added support for code comments