Changed table structure

Changed table structure