Updates for switch to organization