more work to support the new backend