With table sorting added