Updated DMW link parsing