Added operautojoin support