More integration between controller and client