Added the request class and infrastructure