Rework extraction and versions.