Updates to work with `Backend` redesign