[#6]: Collection optimization