Added support for orthogonal joints