Better Dust support for client and server