+Nishant - modified table structure