Update to support new frontend