UPDATE - v.1.5.0 for Wave (built-in OptionTree)