Updates to joins, users and framework