Fixed tables
Tables updates