Updated UDP classes