quality-19 Replace ExpressionExtractor with new objects
https://github.com/regidev/mte/issues/issue/19