Added label/join generation