Added in different types of join constraints