add full comments support