Added support for full load table