Adds extract_xxx methods