Added support for table sorting