Sorting support in FileBasedIdentityStorage, dependency fix