Updated server helper and controller