Changed the way requests are handled