Adding more functionality to the join