some updates to interceptor mechanism