Added more table structures (with dummy data)