Included additional table and handling