[vier] Improve extraction