Add comments to resolver