Update for new sandbox system