Added sorting and tenant config files.