v2.0.1: Remove table scanning during checks