Hotfix - Allow table overrides.