Changed table setup for composite primary key
Started data upload for tables