Refactoring of substitution handling & adding support for nesting