Created custom collections to hopefully avoid the performance issues you facing