Simplified the list of matchable objects