Added more parser data