SingleJoin class edited