Refinements on the source stub