Use more elegant joining solution