Reworked and optimized collection proxy