Add vars and comments