Added client/server framework