Updates to collection lib