Added interception of request