Lots of changes to request processor