Changes to work with new client interface.