Fixed collections to work with the new BASE.js