Partial restructure of Data Tier