Rework request handling and connection