Fixed tables creation, changed tables structure