Refactored DataboxBuilder in ClientBuilder