Added coupled joints handling