Simplify usage and fix extraction.