Improve recent collection logic