Alterations to collection handling