Added sorting support in FileBasedIdentityStore