Added feature for policy interceptors