Add support for fuzzy match arrangements