Migration change

Simplified the table structure.