Add comments support