Added tables automatic adaptation