Simplify working_set, prefixes usage; Fix extension