Added support for multiple tables in conf #19