JoinColumnPair upgrade to Builder model