Updated elements to suit new server interface