Changes to the storage engine + external sort + join on strings