Added support for sorting on specific fields