Changes to support the new backend