Use Collection instead of manually fetching from storage

Change-Id: Ibeae21f7e18c63d64ea66580b0b1e7dfcb379264
Merge "Use Collection instead of manually fetching from storage"