Did require some refactoring of other classes though.
Also implemented dereferencing support in the join helper method.