Simplify extract implementation