Moved interceptor code to a filter.