Adapt new formatter api