Reworked the handling of the source table