Added tables, separated vars to allow override.