major performance improvement and basic qualifier support