Add option delta and option length parse support