WIP - Add extract_xxx methods