updates to table/view structure and new loader