Updated source and paths