More work on loading cluster table