Final changes made to match the new server api