Improve quality of collection detection