improve XContentBuilder API