Improve optimization based on common low surrogates

Ref. #19.