Getting JoinModel to work with recent features