Restructure and Add List Matchers