Updates for the new server environment (beta)