[Core] - Tweaked request handling