Fixed affected classes to work with AllOfExceptEntityMatcher