Changed the interface, so that it uses the same class structures as the
server.