Adding comments support