Added interceptor framework