Some modifications to get ready to fix the bugs associated with validity of Requests