Slightly change TableResolver API