Updated to work with the multi server