Added support for remote sorting