Update to support the new frontend implementation