Add Formatter, rename hijack->intercept