Improve isolation between client and server code