Improvements to client and server generators