Add support for multiple backends with arbitrary configuration
Fix up merge conflict