Updated request logic