Refactored WebRequest