Make work with new interfaces: