adds comments support