Enhanced builder