Fullscan enhancements