Adding interceptor & cleanup