Added extra source table WC for performance