added new option and comment struct