Added sorting support for a few more types.