Major overhaul of client request handling