Initial table design changes