Replace deprecated sourceCmd with sourceCmdWithConsumer