Added context.intercept