1.  Improve *Scan APIs