Implemented ExpressionFactory and model aware joining