Add the ability to specify sort