Improving Request class