Added option  to enable configuration of complex expressions. Fix 2.