Added extraction for all extensions