Switch to schema-level tracking, break out Connection