Added multiple paths support