Update doc + cleanup extension point