Updated tebles to new structure