Further improvements in the Junction class