Added comment block support