Updated tables design