Added expression patching feature, need tests