Improve enumeration of source table