Added support 2 table