optional data parsing fix + plugin improvements