Made table more agnostic.