Some more changes to the interceptor example