Use resources, improve collection getting