More work on table loader.