Adding JoinTypeModel - WIP