Tables added, strange auto generated code...