Better UDP support