Added (optional) identifier support to Collections, plus bugfixes.