Added support for comments (ends up in the OTP field)