Added additional comment codes