Compatible with new join interface