Yes, I'm removing all synchronization and concurrent collection from this code and will add a global RW lock in Matcher.