Updated source setup