Added closed comments support