You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2020/03/13 20:46:17 UTC

[juneau] branch master updated: Auto-generate config setters.

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 76a6c4a  Auto-generate config setters.
76a6c4a is described below

commit 76a6c4a8d20f7b00655aae4e752a195322a90eb2
Author: JamesBognar <ja...@apache.org>
AuthorDate: Fri Mar 13 16:46:03 2020 -0400

    Auto-generate config setters.
---
 .../org/apache/juneau/jena/RdfParserBuilder.java   |  662 +++++-----
 .../apache/juneau/jena/RdfSerializerBuilder.java   |  873 +++++++------
 .../java/org/apache/juneau/BeanContextBuilder.java |   62 +-
 .../org/apache/juneau/BeanTraverseBuilder.java     |  626 +++++----
 .../org/apache/juneau/csv/CsvParserBuilder.java    |  666 +++++-----
 .../apache/juneau/csv/CsvSerializerBuilder.java    |  873 +++++++------
 .../org/apache/juneau/html/HtmlParserBuilder.java  |  745 ++++++-----
 .../apache/juneau/html/HtmlSerializerBuilder.java  |  941 ++++++++------
 .../org/apache/juneau/jso/JsoParserBuilder.java    |  665 +++++-----
 .../apache/juneau/jso/JsoSerializerBuilder.java    |  837 ++++++------
 .../org/apache/juneau/json/JsonParserBuilder.java  |  666 +++++-----
 .../apache/juneau/json/JsonSerializerBuilder.java  |  873 +++++++------
 .../jsonschema/JsonSchemaGeneratorBuilder.java     |  638 +++++----
 .../juneau/msgpack/MsgPackParserBuilder.java       |  661 +++++-----
 .../juneau/msgpack/MsgPackSerializerBuilder.java   |  837 ++++++------
 .../apache/juneau/oapi/OpenApiParserBuilder.java   |  679 ++++++----
 .../juneau/oapi/OpenApiSerializerBuilder.java      |  904 +++++++------
 .../juneau/parser/InputStreamParserBuilder.java    |  646 +++++-----
 .../org/apache/juneau/parser/ParserBuilder.java    |  626 +++++----
 .../apache/juneau/parser/ReaderParserBuilder.java  | 1362 ++++++++++----------
 .../juneau/plaintext/PlainTextParserBuilder.java   |  666 +++++-----
 .../plaintext/PlainTextSerializerBuilder.java      |  873 +++++++------
 .../serializer/OutputStreamSerializerBuilder.java  |  750 +++++++----
 .../juneau/serializer/SerializerBuilder.java       |  638 ++++-----
 .../juneau/serializer/WriterSerializerBuilder.java |  750 +++++++----
 .../juneau/soap/SoapXmlSerializerBuilder.java      |  940 ++++++++------
 .../org/apache/juneau/uon/UonParserBuilder.java    |  666 +++++-----
 .../apache/juneau/uon/UonSerializerBuilder.java    |  873 +++++++------
 .../urlencoding/UrlEncodingParserBuilder.java      |  679 +++++-----
 .../urlencoding/UrlEncodingSerializerBuilder.java  |  904 +++++++------
 .../org/apache/juneau/xml/XmlParserBuilder.java    |  666 +++++-----
 .../apache/juneau/xml/XmlSerializerBuilder.java    |  873 +++++++------
 .../org/apache/juneau/rest/RestContextBuilder.java |  647 +++++-----
 33 files changed, 13759 insertions(+), 11008 deletions(-)

diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index b69ac04..0f3df1b 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -774,669 +774,727 @@ public class RdfParserBuilder extends ReaderParserBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
-
-	@Override /* ReaderParserBuilder */
-	public RdfParserBuilder fileCharset(Charset value) {
-		super.fileCharset(value);
-		return this;
-	}
 
-	@Override /* ReaderParserBuilder */
-	public RdfParserBuilder streamCharset(Charset value) {
-		super.streamCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder autoCloseStreams(boolean value) {
-		super.autoCloseStreams(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder autoCloseStreams() {
-		super.autoCloseStreams();
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder debugOutputLines(int value) {
-		super.debugOutputLines(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder strict(boolean value) {
-		super.strict(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder strict() {
-		super.strict();
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder unbuffered(boolean value) {
-		super.unbuffered(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfParserBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public RdfParserBuilder unbuffered() {
-		super.unbuffered();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder annotations(Annotation...values)  {
+		super.annotations(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanClassVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanClassVisibility(Visibility value)  {
 		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanConstructorVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanConstructorVisibility(Visibility value)  {
 		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfParserBuilder beanDictionary(Class<?>...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanDictionary(java.lang.Class<?>...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfParserBuilder beanDictionary(Object...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanDictionary(Object...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfParserBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfParserBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfParserBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfParserBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanFieldVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanFieldVisibility(Visibility value)  {
 		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanFilters(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanFilters(java.lang.Class<?>...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanFilters(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanFilters(Object...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanMethodVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanMethodVisibility(Visibility value)  {
 		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beansRequireDefaultConstructor() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beansRequireDefaultConstructor()  {
 		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beansRequireSerializable() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beansRequireSerializable()  {
 		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beansRequireSettersForGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beansRequireSettersForGetters()  {
 		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder debug() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder debug()  {
 		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder dictionary(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder debug(boolean value)  {
+		super.debug(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder dictionary(java.lang.Class<?>...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder dictionary(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder dictionary(Object...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder dictionaryReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder dictionaryReplace(java.lang.Class<?>...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder dictionaryReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder dictionaryReplace(Object...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> RdfParserBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> RdfParserBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> RdfParserBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> RdfParserBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder fluentSetters()  {
+		super.fluentSetters();
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreInvocationExceptionsOnGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreInvocationExceptionsOnGetters()  {
 		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreInvocationExceptionsOnSetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreInvocationExceptionsOnSetters()  {
 		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignorePropertiesWithoutSetters(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignorePropertiesWithoutSetters(boolean value)  {
 		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreTransientFields(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreTransientFields(boolean value)  {
 		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder ignoreUnknownNullBeanProperties(boolean value)  {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
 		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder implClasses(Map<String,Class<?>> values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder implClasses(Map<String,Class<?>> values)  {
 		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder locale(Locale value) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder locale(Locale value)  {
 		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder mediaType(MediaType value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder mediaType(MediaType value)  {
 		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanClasses(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanClasses(java.lang.Class<?>...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanClasses(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanClasses(Object...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanPackages(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanPackages(Object...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanPackages(String...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanPackages(String...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder pojoSwaps(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder pojoSwaps(java.lang.Class<?>...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder pojoSwaps(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder pojoSwaps(Object...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder pojoSwapsReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder pojoSwapsReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder pojoSwapsReplace(Object...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder sortProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder sortProperties(boolean value)  {
 		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder useEnumNames(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder useEnumNames(boolean value)  {
 		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder useJavaBeanIntrospector(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfParserBuilder useJavaBeanIntrospector(boolean value)  {
 		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfParserBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder autoCloseStreams()  {
+		super.autoCloseStreams();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder annotations(Annotation...values) {
-		super.annotations(values);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder autoCloseStreams(boolean value)  {
+		super.autoCloseStreams(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder debugOutputLines(int value)  {
+		super.debugOutputLines(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder listener(Class<? extends org.apache.juneau.parser.ParserListener> value)  {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder strict()  {
+		super.strict();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder strict(boolean value)  {
+		super.strict(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder trimStrings()  {
+		super.trimStrings();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder trimStrings(boolean value)  {
+		super.trimStrings(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder unbuffered()  {
+		super.unbuffered();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - ParserBuilder */
+	public RdfParserBuilder unbuffered(boolean value)  {
+		super.unbuffered(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - ReaderParserBuilder */
+	public RdfParserBuilder fileCharset(Charset value)  {
+		super.fileCharset(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfParserBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - ReaderParserBuilder */
+	public RdfParserBuilder streamCharset(Charset value)  {
+		super.streamCharset(value);
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 }
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 3d2fccf..53ce604 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -898,794 +898,871 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder fileCharset(Charset value) {
-		super.fileCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder quoteChar(char value) {
-		super.quoteChar(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder sq() {
-		super.sq();
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder streamCharset(Charset value) {
-		super.streamCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder useWhitespace() {
-		super.useWhitespace();
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public RdfSerializerBuilder ws() {
-		super.ws();
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder addBeanTypes(boolean value) {
-		super.addBeanTypes(value);
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder addBeanTypes() {
-		super.addBeanTypes();
+	@Override /* GENERATED - ContextBuilder */
+	public RdfSerializerBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder addRootType(boolean value) {
-		super.addRootType(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder annotations(Annotation...values)  {
+		super.annotations(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder addRootType() {
-		super.addRootType();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanClassVisibility(Visibility value)  {
+		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder detectRecursions(boolean value) {
-		super.detectRecursions(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanConstructorVisibility(Visibility value)  {
+		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder detectRecursions() {
-		super.detectRecursions();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanDictionary(java.lang.Class<?>...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder ignoreRecursions(boolean value) {
-		super.ignoreRecursions(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanDictionary(Object...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder ignoreRecursions() {
-		super.ignoreRecursions();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanFieldVisibility(Visibility value)  {
+		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder sortCollections() {
-		super.sortCollections();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanFilters(java.lang.Class<?>...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanFilters(Object...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder sortMaps() {
-		super.sortMaps();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder trimEmptyCollections(boolean value) {
-		super.trimEmptyCollections(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder trimEmptyCollections() {
-		super.trimEmptyCollections();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder trimEmptyMaps(boolean value) {
-		super.trimEmptyMaps(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder trimEmptyMaps() {
-		super.trimEmptyMaps();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanMethodVisibility(Visibility value)  {
+		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beansRequireDefaultConstructor()  {
+		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder uriRelativity(UriRelativity value) {
-		super.uriRelativity(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public RdfSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beansRequireSerializable()  {
+		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanClassVisibility(Visibility value) {
-		super.beanClassVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanConstructorVisibility(Visibility value) {
-		super.beanConstructorVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beansRequireSettersForGetters()  {
+		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfSerializerBuilder beanDictionary(Class<?>...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfSerializerBuilder beanDictionary(Object...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfSerializerBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfSerializerBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfSerializerBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public RdfSerializerBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanFieldVisibility(Visibility value) {
-		super.beanFieldVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanFilters(Class<?>...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanFilters(Object...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder debug()  {
+		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanMethodVisibility(Visibility value) {
-		super.beanMethodVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder debug(boolean value)  {
+		super.debug(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder dictionary(java.lang.Class<?>...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beansRequireDefaultConstructor() {
-		super.beansRequireDefaultConstructor();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder dictionary(Object...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beansRequireSerializable() {
-		super.beansRequireSerializable();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder dictionaryReplace(java.lang.Class<?>...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beansRequireSettersForGetters() {
-		super.beansRequireSettersForGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder dictionaryReplace(Object...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> RdfSerializerBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> RdfSerializerBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder fluentSetters()  {
+		super.fluentSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreInvocationExceptionsOnGetters()  {
+		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreInvocationExceptionsOnSetters()  {
+		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignorePropertiesWithoutSetters(boolean value)  {
+		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreTransientFields(boolean value)  {
+		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder debug() {
-		super.debug();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder dictionary(Class<?>...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder dictionary(Object...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder ignoreUnknownNullBeanProperties(boolean value)  {
+		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder dictionaryReplace(Class<?>...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
+		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder dictionaryReplace(Object...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder implClasses(Map<String,Class<?>> values)  {
+		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> RdfSerializerBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> RdfSerializerBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder locale(Locale value)  {
+		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder mediaType(MediaType value)  {
+		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreInvocationExceptionsOnGetters() {
-		super.ignoreInvocationExceptionsOnGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanClasses(java.lang.Class<?>...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanClasses(Object...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreInvocationExceptionsOnSetters() {
-		super.ignoreInvocationExceptionsOnSetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignorePropertiesWithoutSetters(boolean value) {
-		super.ignorePropertiesWithoutSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreTransientFields(boolean value) {
-		super.ignoreTransientFields(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanPackages(Object...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
-		super.ignoreUnknownNullBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanPackages(String...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
-		super.implClass(interfaceClass, implClass);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder implClasses(Map<String,Class<?>> values) {
-		super.implClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder locale(Locale value) {
-		super.locale(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder mediaType(MediaType value) {
-		super.mediaType(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanClasses(Class<?>...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder pojoSwaps(java.lang.Class<?>...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanClasses(Object...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder pojoSwaps(Object...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder pojoSwapsReplace(Object...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanPackages(Object...values) {
-		super.notBeanPackages(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanPackages(String...values) {
-		super.notBeanPackages(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder sortProperties(boolean value)  {
+		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder useEnumNames(boolean value)  {
+		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder pojoSwaps(Class<?>...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder pojoSwaps(Object...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder pojoSwapsReplace(Class<?>...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public RdfSerializerBuilder useJavaBeanIntrospector(boolean value)  {
+		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder pojoSwapsReplace(Object...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public RdfSerializerBuilder detectRecursions()  {
+		super.detectRecursions();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public RdfSerializerBuilder detectRecursions(boolean value)  {
+		super.detectRecursions(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public RdfSerializerBuilder ignoreRecursions()  {
+		super.ignoreRecursions();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder sortProperties(boolean value) {
-		super.sortProperties(value);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public RdfSerializerBuilder ignoreRecursions(boolean value)  {
+		super.ignoreRecursions(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public RdfSerializerBuilder initialDepth(int value)  {
+		super.initialDepth(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public RdfSerializerBuilder maxDepth(int value)  {
+		super.maxDepth(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder useEnumNames(boolean value) {
-		super.useEnumNames(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder addBeanTypes()  {
+		super.addBeanTypes();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder addBeanTypes(boolean value)  {
+		super.addBeanTypes(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder addRootType()  {
+		super.addRootType();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder useJavaBeanIntrospector(boolean value) {
-		super.useJavaBeanIntrospector(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder addRootType(boolean value)  {
+		super.addRootType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public RdfSerializerBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder listener(Class<? extends org.apache.juneau.serializer.SerializerListener> value)  {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder annotations(Annotation...values) {
-		super.annotations(values);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder sortCollections()  {
+		super.sortCollections();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder sortCollections(boolean value)  {
+		super.sortCollections(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder sortMaps()  {
+		super.sortMaps();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder sortMaps(boolean value)  {
+		super.sortMaps(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder trimEmptyCollections()  {
+		super.trimEmptyCollections();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder trimEmptyCollections(boolean value)  {
+		super.trimEmptyCollections(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder trimEmptyMaps()  {
+		super.trimEmptyMaps();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder trimEmptyMaps(boolean value)  {
+		super.trimEmptyMaps(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder trimNullProperties(boolean value)  {
+		super.trimNullProperties(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder trimStrings()  {
+		super.trimStrings();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public RdfSerializerBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder trimStrings(boolean value)  {
+		super.trimStrings(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder uriContext(String value)  {
+		super.uriContext(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder uriContext(UriContext value)  {
+		super.uriContext(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder uriRelativity(String value)  {
+		super.uriRelativity(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder uriRelativity(UriRelativity value)  {
+		super.uriRelativity(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder uriResolution(String value)  {
+		super.uriResolution(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public RdfSerializerBuilder uriResolution(UriResolution value)  {
+		super.uriResolution(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder fileCharset(Charset value)  {
+		super.fileCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder maxIndent(int value)  {
+		super.maxIndent(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder quoteChar(char value)  {
+		super.quoteChar(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder sq()  {
+		super.sq();
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder streamCharset(Charset value)  {
+		super.streamCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder useWhitespace()  {
+		super.useWhitespace();
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder useWhitespace(boolean value)  {
+		super.useWhitespace(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public RdfSerializerBuilder ws()  {
+		super.ws();
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index 79af3c5..4ccac2f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -2129,69 +2129,67 @@ public class BeanContextBuilder extends ContextBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanContextBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - ContextBuilder */
+	public BeanContextBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
index 214db4f..e5e3403 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
@@ -177,597 +177,655 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder annotations(Annotation...values) {
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
+		return this;
+	}
+
+	@Override /* GENERATED - ContextBuilder */
+	public BeanTraverseBuilder set(String name, Object value)  {
+		super.set(name, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder annotations(Annotation...values)  {
 		super.annotations(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanClassVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanClassVisibility(Visibility value)  {
 		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanConstructorVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanConstructorVisibility(Visibility value)  {
 		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public BeanTraverseBuilder beanDictionary(Class<?>...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanDictionary(java.lang.Class<?>...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public BeanTraverseBuilder beanDictionary(Object...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanDictionary(Object...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public BeanTraverseBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public BeanTraverseBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public BeanTraverseBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public BeanTraverseBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanFieldVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanFieldVisibility(Visibility value)  {
 		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanFilters(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanFilters(java.lang.Class<?>...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanFilters(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanFilters(Object...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanMethodVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanMethodVisibility(Visibility value)  {
 		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beansRequireDefaultConstructor() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beansRequireDefaultConstructor()  {
 		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beansRequireSerializable() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beansRequireSerializable()  {
 		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beansRequireSettersForGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beansRequireSettersForGetters()  {
 		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder debug() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder debug()  {
 		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder dictionary(Class<?>...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder debug(boolean value)  {
+		super.debug(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder dictionary(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder dictionary(java.lang.Class<?>...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder dictionaryReplace(Class<?>...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder dictionary(Object...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder dictionaryReplace(Object...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder dictionaryRemove(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder dictionaryRemove(Object...values)  {
 		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder dictionaryReplace(java.lang.Class<?>...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> BeanTraverseBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder dictionaryReplace(Object...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> BeanTraverseBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> BeanTraverseBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> BeanTraverseBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreInvocationExceptionsOnGetters() {
-		super.ignoreInvocationExceptionsOnGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreInvocationExceptionsOnSetters() {
-		super.ignoreInvocationExceptionsOnSetters();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignorePropertiesWithoutSetters(boolean value) {
-		super.ignorePropertiesWithoutSetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreTransientFields(boolean value) {
-		super.ignoreTransientFields(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder fluentSetters()  {
+		super.fluentSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreInvocationExceptionsOnGetters()  {
+		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder ignoreUnknownNullBeanProperties(boolean value) {
-		super.ignoreUnknownNullBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
-		super.implClass(interfaceClass, implClass);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreInvocationExceptionsOnSetters()  {
+		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder implClasses(Map<String,Class<?>> values) {
-		super.implClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder locale(Locale value) {
-		super.locale(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignorePropertiesWithoutSetters(boolean value)  {
+		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder mediaType(MediaType value) {
-		super.mediaType(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreTransientFields(boolean value)  {
+		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanClasses(Class<?>...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanClasses(Object...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder ignoreUnknownNullBeanProperties(boolean value)  {
+		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
+		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder implClasses(Map<String,Class<?>> values)  {
+		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanPackages(Object...values) {
-		super.notBeanPackages(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanPackages(String...values) {
-		super.notBeanPackages(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder locale(Locale value)  {
+		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder mediaType(MediaType value)  {
+		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanClasses(java.lang.Class<?>...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanClasses(Object...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder pojoSwaps(Class<?>...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder pojoSwaps(Object...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder pojoSwapsReplace(Class<?>...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder pojoSwapsReplace(Object...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanPackages(Object...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanPackages(String...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder sortProperties(boolean value) {
-		super.sortProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder useEnumNames(boolean value) {
-		super.useEnumNames(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder pojoSwaps(java.lang.Class<?>...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder pojoSwaps(Object...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder useJavaBeanIntrospector(boolean value) {
-		super.useJavaBeanIntrospector(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public BeanTraverseBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder pojoSwapsReplace(Object...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder sortProperties(boolean value)  {
+		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder useEnumNames(boolean value)  {
+		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public BeanTraverseBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public BeanTraverseBuilder useJavaBeanIntrospector(boolean value)  {
+		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
index 5d70bbe..3ceb0cb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
@@ -55,669 +55,727 @@ public class CsvParserBuilder extends ReaderParserBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
-
-	@Override /* ReaderParserBuilder */
-	public CsvParserBuilder fileCharset(Charset value) {
-		super.fileCharset(value);
-		return this;
-	}
-
-	@Override /* ReaderParserBuilder */
-	public CsvParserBuilder streamCharset(Charset value) {
-		super.streamCharset(value);
-		return this;
-	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder autoCloseStreams(boolean value) {
-		super.autoCloseStreams(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder autoCloseStreams() {
-		super.autoCloseStreams();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder debugOutputLines(int value) {
-		super.debugOutputLines(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder strict(boolean value) {
-		super.strict(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder strict() {
-		super.strict();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder unbuffered(boolean value) {
-		super.unbuffered(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public CsvParserBuilder unbuffered() {
-		super.unbuffered();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvParserBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder annotations(Annotation...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder annotations(Annotation...values)  {
 		super.annotations(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanClassVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanClassVisibility(Visibility value)  {
 		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanConstructorVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanConstructorVisibility(Visibility value)  {
 		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvParserBuilder beanDictionary(Class<?>...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanDictionary(java.lang.Class<?>...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvParserBuilder beanDictionary(Object...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanDictionary(Object...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvParserBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvParserBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvParserBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvParserBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanFieldVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanFieldVisibility(Visibility value)  {
 		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanFilters(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanFilters(java.lang.Class<?>...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanFilters(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanFilters(Object...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanMethodVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanMethodVisibility(Visibility value)  {
 		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beansRequireDefaultConstructor() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beansRequireDefaultConstructor()  {
 		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beansRequireSerializable() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beansRequireSerializable()  {
 		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beansRequireSettersForGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beansRequireSettersForGetters()  {
 		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder debug() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder debug()  {
 		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder dictionary(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder debug(boolean value)  {
+		super.debug(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder dictionary(java.lang.Class<?>...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder dictionary(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder dictionary(Object...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder dictionaryReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder dictionaryReplace(java.lang.Class<?>...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder dictionaryReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder dictionaryReplace(Object...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> CsvParserBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> CsvParserBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> CsvParserBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> CsvParserBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreInvocationExceptionsOnGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder fluentSetters()  {
+		super.fluentSetters();
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreInvocationExceptionsOnGetters()  {
 		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreInvocationExceptionsOnSetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreInvocationExceptionsOnSetters()  {
 		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignorePropertiesWithoutSetters(boolean value) {
-		super.ignorePropertiesWithoutSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignorePropertiesWithoutSetters(boolean value)  {
+		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreTransientFields(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreTransientFields(boolean value)  {
 		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreUnknownBeanProperties() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreUnknownBeanProperties()  {
 		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder ignoreUnknownNullBeanProperties(boolean value)  {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
 		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder implClasses(Map<String,Class<?>> values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder implClasses(Map<String,Class<?>> values)  {
 		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder locale(Locale value) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder locale(Locale value)  {
 		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder mediaType(MediaType value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder mediaType(MediaType value)  {
 		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanClasses(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanClasses(java.lang.Class<?>...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanClasses(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanClasses(Object...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanPackages(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanPackages(Object...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanPackages(String...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanPackages(String...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder pojoSwaps(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder pojoSwaps(java.lang.Class<?>...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder pojoSwaps(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder pojoSwaps(Object...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder pojoSwapsReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder pojoSwapsReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder pojoSwapsReplace(Object...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder sortProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder sortProperties(boolean value)  {
 		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder useEnumNames(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder useEnumNames(boolean value)  {
 		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder useJavaBeanIntrospector(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvParserBuilder useJavaBeanIntrospector(boolean value)  {
 		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvParserBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder autoCloseStreams()  {
+		super.autoCloseStreams();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder autoCloseStreams(boolean value)  {
+		super.autoCloseStreams(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder debugOutputLines(int value)  {
+		super.debugOutputLines(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder listener(Class<? extends org.apache.juneau.parser.ParserListener> value)  {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder strict()  {
+		super.strict();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder strict(boolean value)  {
+		super.strict(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder trimStrings()  {
+		super.trimStrings();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder trimStrings(boolean value)  {
+		super.trimStrings(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder unbuffered()  {
+		super.unbuffered();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - ParserBuilder */
+	public CsvParserBuilder unbuffered(boolean value)  {
+		super.unbuffered(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvParserBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - ReaderParserBuilder */
+	public CsvParserBuilder fileCharset(Charset value)  {
+		super.fileCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - ReaderParserBuilder */
+	public CsvParserBuilder streamCharset(Charset value)  {
+		super.streamCharset(value);
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
index be3429b..fa2ca18 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
@@ -55,794 +55,871 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder fileCharset(Charset value) {
-		super.fileCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder quoteChar(char value) {
-		super.quoteChar(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder sq() {
-		super.sq();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder streamCharset(Charset value) {
-		super.streamCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder useWhitespace() {
-		super.useWhitespace();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public CsvSerializerBuilder ws() {
-		super.ws();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder addBeanTypes(boolean value) {
-		super.addBeanTypes(value);
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder addBeanTypes() {
-		super.addBeanTypes();
+	@Override /* GENERATED - ContextBuilder */
+	public CsvSerializerBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder addRootType(boolean value) {
-		super.addRootType(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder annotations(Annotation...values)  {
+		super.annotations(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder addRootType() {
-		super.addRootType();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanClassVisibility(Visibility value)  {
+		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder detectRecursions(boolean value) {
-		super.detectRecursions(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanConstructorVisibility(Visibility value)  {
+		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder detectRecursions() {
-		super.detectRecursions();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanDictionary(java.lang.Class<?>...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder ignoreRecursions(boolean value) {
-		super.ignoreRecursions(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanDictionary(Object...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder ignoreRecursions() {
-		super.ignoreRecursions();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanFieldVisibility(Visibility value)  {
+		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder sortCollections() {
-		super.sortCollections();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanFilters(java.lang.Class<?>...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanFilters(Object...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder sortMaps() {
-		super.sortMaps();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder trimEmptyCollections(boolean value) {
-		super.trimEmptyCollections(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder trimEmptyCollections() {
-		super.trimEmptyCollections();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder trimEmptyMaps(boolean value) {
-		super.trimEmptyMaps(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder trimEmptyMaps() {
-		super.trimEmptyMaps();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanMethodVisibility(Visibility value)  {
+		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beansRequireDefaultConstructor()  {
+		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder uriRelativity(UriRelativity value) {
-		super.uriRelativity(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public CsvSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beansRequireSerializable()  {
+		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder annotations(Annotation...values) {
-		super.annotations(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanClassVisibility(Visibility value) {
-		super.beanClassVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beansRequireSettersForGetters()  {
+		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanConstructorVisibility(Visibility value) {
-		super.beanConstructorVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvSerializerBuilder beanDictionary(Class<?>...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvSerializerBuilder beanDictionary(Object...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvSerializerBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvSerializerBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvSerializerBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public CsvSerializerBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanFieldVisibility(Visibility value) {
-		super.beanFieldVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanFilters(Class<?>...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanFilters(Object...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder debug()  {
+		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder debug(boolean value)  {
+		super.debug(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanMethodVisibility(Visibility value) {
-		super.beanMethodVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder dictionary(java.lang.Class<?>...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder dictionary(Object...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beansRequireDefaultConstructor() {
-		super.beansRequireDefaultConstructor();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beansRequireSerializable() {
-		super.beansRequireSerializable();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder dictionaryReplace(java.lang.Class<?>...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder dictionaryReplace(Object...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beansRequireSettersForGetters() {
-		super.beansRequireSettersForGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> CsvSerializerBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> CsvSerializerBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder fluentSetters()  {
+		super.fluentSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreInvocationExceptionsOnGetters()  {
+		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreInvocationExceptionsOnSetters()  {
+		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignorePropertiesWithoutSetters(boolean value)  {
+		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreTransientFields(boolean value)  {
+		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder debug() {
-		super.debug();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder dictionary(Class<?>...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder ignoreUnknownNullBeanProperties(boolean value)  {
+		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder dictionary(Object...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
+		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder dictionaryReplace(Class<?>...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder implClasses(Map<String,Class<?>> values)  {
+		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder dictionaryReplace(Object...values) {
-		super.dictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> CsvSerializerBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder locale(Locale value)  {
+		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> CsvSerializerBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder mediaType(MediaType value)  {
+		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanClasses(java.lang.Class<?>...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreInvocationExceptionsOnGetters() {
-		super.ignoreInvocationExceptionsOnGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanClasses(Object...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreInvocationExceptionsOnSetters() {
-		super.ignoreInvocationExceptionsOnSetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignorePropertiesWithoutSetters(boolean value) {
-		super.ignorePropertiesWithoutSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreTransientFields(boolean value) {
-		super.ignoreTransientFields(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanPackages(Object...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanPackages(String...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
-		super.ignoreUnknownNullBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
-		super.implClass(interfaceClass, implClass);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder implClasses(Map<String,Class<?>> values) {
-		super.implClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder locale(Locale value) {
-		super.locale(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder mediaType(MediaType value) {
-		super.mediaType(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder pojoSwaps(java.lang.Class<?>...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanClasses(Class<?>...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder pojoSwaps(Object...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanClasses(Object...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder pojoSwapsReplace(Object...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanPackages(Object...values) {
-		super.notBeanPackages(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanPackages(String...values) {
-		super.notBeanPackages(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder sortProperties(boolean value)  {
+		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder useEnumNames(boolean value)  {
+		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder pojoSwaps(Class<?>...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder pojoSwaps(Object...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public CsvSerializerBuilder useJavaBeanIntrospector(boolean value)  {
+		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder pojoSwapsReplace(Class<?>...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public CsvSerializerBuilder detectRecursions()  {
+		super.detectRecursions();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder pojoSwapsReplace(Object...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public CsvSerializerBuilder detectRecursions(boolean value)  {
+		super.detectRecursions(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public CsvSerializerBuilder ignoreRecursions()  {
+		super.ignoreRecursions();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public CsvSerializerBuilder ignoreRecursions(boolean value)  {
+		super.ignoreRecursions(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder sortProperties(boolean value) {
-		super.sortProperties(value);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public CsvSerializerBuilder initialDepth(int value)  {
+		super.initialDepth(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public CsvSerializerBuilder maxDepth(int value)  {
+		super.maxDepth(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder addBeanTypes()  {
+		super.addBeanTypes();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder useEnumNames(boolean value) {
-		super.useEnumNames(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder addBeanTypes(boolean value)  {
+		super.addBeanTypes(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder addRootType()  {
+		super.addRootType();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder addRootType(boolean value)  {
+		super.addRootType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder useJavaBeanIntrospector(boolean value) {
-		super.useJavaBeanIntrospector(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder listener(Class<? extends org.apache.juneau.serializer.SerializerListener> value)  {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public CsvSerializerBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder sortCollections()  {
+		super.sortCollections();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder sortCollections(boolean value)  {
+		super.sortCollections(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder sortMaps()  {
+		super.sortMaps();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder sortMaps(boolean value)  {
+		super.sortMaps(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder trimEmptyCollections()  {
+		super.trimEmptyCollections();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder trimEmptyCollections(boolean value)  {
+		super.trimEmptyCollections(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder trimEmptyMaps()  {
+		super.trimEmptyMaps();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder trimEmptyMaps(boolean value)  {
+		super.trimEmptyMaps(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder trimNullProperties(boolean value)  {
+		super.trimNullProperties(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder trimStrings()  {
+		super.trimStrings();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public CsvSerializerBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder trimStrings(boolean value)  {
+		super.trimStrings(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder uriContext(String value)  {
+		super.uriContext(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder uriContext(UriContext value)  {
+		super.uriContext(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder uriRelativity(String value)  {
+		super.uriRelativity(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder uriRelativity(UriRelativity value)  {
+		super.uriRelativity(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder uriResolution(String value)  {
+		super.uriResolution(value);
+		return this;
+	}
+
+	@Override /* GENERATED - SerializerBuilder */
+	public CsvSerializerBuilder uriResolution(UriResolution value)  {
+		super.uriResolution(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder fileCharset(Charset value)  {
+		super.fileCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder maxIndent(int value)  {
+		super.maxIndent(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder quoteChar(char value)  {
+		super.quoteChar(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder sq()  {
+		super.sq();
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder streamCharset(Charset value)  {
+		super.streamCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder useWhitespace()  {
+		super.useWhitespace();
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder useWhitespace(boolean value)  {
+		super.useWhitespace(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public CsvSerializerBuilder ws()  {
+		super.ws();
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
index 5cd00cf..4d71851 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
@@ -22,7 +22,6 @@ import javax.xml.stream.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
-import org.apache.juneau.parser.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 import org.apache.juneau.xml.*;
@@ -59,687 +58,787 @@ public class HtmlParserBuilder extends XmlParserBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
-
-	@Override /* XmlParserBuilder */
-	public HtmlParserBuilder validating(boolean value) {
-		super.validating(value);
-		return this;
-	}
 
-	@Override /* XmlParserBuilder */
-	public HtmlParserBuilder validating() {
-		super.validating();
-		return this;
-	}
-
-	@Override /* XmlParserBuilder */
-	public HtmlParserBuilder reporter(XMLReporter value) {
-		super.reporter(value);
-		return this;
-	}
-
-	@Override /* XmlParserBuilder */
-	public HtmlParserBuilder resolver(XMLResolver value) {
-		super.resolver(value);
-		return this;
-	}
-
-	@Override /* XmlParserBuilder */
-	public HtmlParserBuilder eventAllocator(XMLEventAllocator value) {
-		super.eventAllocator(value);
-		return this;
-	}
-
-	@Override /* ReaderParserBuilder */
-	public HtmlParserBuilder fileCharset(Charset value) {
-		super.fileCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* ReaderParserBuilder */
-	public HtmlParserBuilder streamCharset(Charset value) {
-		super.streamCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder autoCloseStreams(boolean value) {
-		super.autoCloseStreams(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder autoCloseStreams() {
-		super.autoCloseStreams();
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder debugOutputLines(int value) {
-		super.debugOutputLines(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder strict(boolean value) {
-		super.strict(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder strict() {
-		super.strict();
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public HtmlParserBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlParserBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder annotations(Annotation...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder annotations(Annotation...values)  {
 		super.annotations(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanClassVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanClassVisibility(Visibility value)  {
 		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanConstructorVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanConstructorVisibility(Visibility value)  {
 		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlParserBuilder beanDictionary(Class<?>...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanDictionary(java.lang.Class<?>...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlParserBuilder beanDictionary(Object...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanDictionary(Object...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlParserBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlParserBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlParserBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlParserBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanFieldVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanFieldVisibility(Visibility value)  {
 		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanFilters(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanFilters(java.lang.Class<?>...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanFilters(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanFilters(Object...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanMethodVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanMethodVisibility(Visibility value)  {
 		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beansRequireDefaultConstructor() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beansRequireDefaultConstructor()  {
 		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beansRequireSerializable() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beansRequireSerializable()  {
 		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beansRequireSettersForGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beansRequireSettersForGetters()  {
 		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder debug() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder debug()  {
 		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder dictionary(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder debug(boolean value)  {
+		super.debug(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder dictionary(java.lang.Class<?>...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder dictionary(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder dictionary(Object...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder dictionaryReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder dictionaryReplace(java.lang.Class<?>...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder dictionaryReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder dictionaryReplace(Object...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> HtmlParserBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> HtmlParserBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> HtmlParserBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> HtmlParserBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder fluentSetters()  {
+		super.fluentSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreInvocationExceptionsOnGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreInvocationExceptionsOnGetters()  {
 		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreInvocationExceptionsOnSetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreInvocationExceptionsOnSetters()  {
 		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignorePropertiesWithoutSetters(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignorePropertiesWithoutSetters(boolean value)  {
 		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreTransientFields(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreTransientFields(boolean value)  {
 		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder ignoreUnknownNullBeanProperties(boolean value)  {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
 		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder implClasses(Map<String,Class<?>> values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder implClasses(Map<String,Class<?>> values)  {
 		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder locale(Locale value) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder locale(Locale value)  {
 		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder mediaType(MediaType value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder mediaType(MediaType value)  {
 		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanClasses(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanClasses(java.lang.Class<?>...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanClasses(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanClasses(Object...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanPackages(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanPackages(Object...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanPackages(String...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanPackages(String...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder pojoSwaps(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder pojoSwaps(java.lang.Class<?>...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder pojoSwaps(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder pojoSwaps(Object...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder pojoSwapsReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder pojoSwapsReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder pojoSwapsReplace(Object...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder sortProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder sortProperties(boolean value)  {
 		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder useEnumNames(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder useEnumNames(boolean value)  {
 		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder useJavaBeanIntrospector(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlParserBuilder useJavaBeanIntrospector(boolean value)  {
 		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlParserBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder autoCloseStreams()  {
+		super.autoCloseStreams();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder autoCloseStreams(boolean value)  {
+		super.autoCloseStreams(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder debugOutputLines(int value)  {
+		super.debugOutputLines(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder listener(Class<? extends org.apache.juneau.parser.ParserListener> value)  {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder strict()  {
+		super.strict();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder strict(boolean value)  {
+		super.strict(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder trimStrings()  {
+		super.trimStrings();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder trimStrings(boolean value)  {
+		super.trimStrings(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder unbuffered()  {
+		super.unbuffered();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - ParserBuilder */
+	public HtmlParserBuilder unbuffered(boolean value)  {
+		super.unbuffered(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlParserBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - ReaderParserBuilder */
+	public HtmlParserBuilder fileCharset(Charset value)  {
+		super.fileCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - ReaderParserBuilder */
+	public HtmlParserBuilder streamCharset(Charset value)  {
+		super.streamCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder eventAllocator(Class<? extends javax.xml.stream.util.XMLEventAllocator> value)  {
+		super.eventAllocator(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder eventAllocator(XMLEventAllocator value)  {
+		super.eventAllocator(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder preserveRootElement()  {
+		super.preserveRootElement();
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder preserveRootElement(boolean value)  {
+		super.preserveRootElement(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder reporter(Class<? extends javax.xml.stream.XMLReporter> value)  {
+		super.reporter(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder reporter(XMLReporter value)  {
+		super.reporter(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder resolver(Class<? extends javax.xml.stream.XMLResolver> value)  {
+		super.resolver(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder resolver(XMLResolver value)  {
+		super.resolver(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder validating()  {
+		super.validating();
+		return this;
+	}
+
+	@Override /* GENERATED - XmlParserBuilder */
+	public HtmlParserBuilder validating(boolean value)  {
+		super.validating(value);
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index 4e8b5b3..a704373 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
@@ -23,7 +23,6 @@ import org.apache.juneau.*;
 import org.apache.juneau.http.*;
 import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
-import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
 import org.apache.juneau.xml.*;
 
@@ -195,837 +194,937 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
 
-	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
-		super.addNamespaceUrisToRoot(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder addNamespaceUrisToRoot() {
-		super.addNamespaceUrisToRoot();
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder autoDetectNamespaces(boolean value) {
-		super.autoDetectNamespaces(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder defaultNamespace(String value) {
-		super.defaultNamespace(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder enableNamespaces(boolean value) {
-		super.enableNamespaces(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder namespaces(Namespace...values) {
-		super.namespaces(values);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* XmlSerializerBuilder */
-	@Deprecated
-	public HtmlSerializerBuilder xsNamespace(Namespace value) {
-		super.xsNamespace(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder fileCharset(Charset value) {
-		super.fileCharset(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder quoteChar(char value) {
-		super.quoteChar(value);
+	@Override /* GENERATED - ContextBuilder */
+	public HtmlSerializerBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder sq() {
-		super.sq();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder annotations(Annotation...values)  {
+		super.annotations(values);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder streamCharset(Charset value) {
-		super.streamCharset(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanClassVisibility(Visibility value)  {
+		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanConstructorVisibility(Visibility value)  {
+		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder useWhitespace() {
-		super.useWhitespace();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanDictionary(java.lang.Class<?>...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* WriterSerializerBuilder */
-	public HtmlSerializerBuilder ws() {
-		super.ws();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanDictionary(Object...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder addBeanTypes(boolean value) {
-		super.addBeanTypes(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder addBeanTypes() {
-		super.addBeanTypes();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder addRootType(boolean value) {
-		super.addRootType(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder addRootType() {
-		super.addRootType();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder detectRecursions(boolean value) {
-		super.detectRecursions(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanFieldVisibility(Visibility value)  {
+		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder detectRecursions() {
-		super.detectRecursions();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanFilters(java.lang.Class<?>...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder ignoreRecursions(boolean value) {
-		super.ignoreRecursions(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanFilters(Object...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder ignoreRecursions() {
-		super.ignoreRecursions();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder sortCollections() {
-		super.sortCollections();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanMethodVisibility(Visibility value)  {
+		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder sortMaps() {
-		super.sortMaps();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimEmptyCollections(boolean value) {
-		super.trimEmptyCollections(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beansRequireDefaultConstructor()  {
+		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimEmptyCollections() {
-		super.trimEmptyCollections();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimEmptyMaps(boolean value) {
-		super.trimEmptyMaps(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beansRequireSerializable()  {
+		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimEmptyMaps() {
-		super.trimEmptyMaps();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beansRequireSettersForGetters()  {
+		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder uriRelativity(UriRelativity value) {
-		super.uriRelativity(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder annotations(Annotation...values) {
-		super.annotations(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanClassVisibility(Visibility value) {
-		super.beanClassVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanConstructorVisibility(Visibility value) {
-		super.beanConstructorVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlSerializerBuilder beanDictionary(Class<?>...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlSerializerBuilder beanDictionary(Object...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlSerializerBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlSerializerBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlSerializerBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public HtmlSerializerBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanFieldVisibility(Visibility value) {
-		super.beanFieldVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder debug()  {
+		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanFilters(Class<?>...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder debug(boolean value)  {
+		super.debug(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanFilters(Object...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder dictionary(java.lang.Class<?>...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder dictionary(Object...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder dictionaryReplace(java.lang.Class<?>...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder dictionaryReplace(Object...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> HtmlSerializerBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanMethodVisibility(Visibility value) {
-		super.beanMethodVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> HtmlSerializerBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beansRequireDefaultConstructor() {
-		super.beansRequireDefaultConstructor();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beansRequireSerializable() {
-		super.beansRequireSerializable();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder fluentSetters()  {
+		super.fluentSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beansRequireSettersForGetters() {
-		super.beansRequireSettersForGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreInvocationExceptionsOnGetters()  {
+		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreInvocationExceptionsOnSetters()  {
+		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignorePropertiesWithoutSetters(boolean value)  {
+		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreTransientFields(boolean value)  {
+		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder ignoreUnknownNullBeanProperties(boolean value)  {
+		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
+		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder implClasses(Map<String,Class<?>> values)  {
+		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder debug() {
-		super.debug();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder locale(Locale value)  {
+		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder dictionary(Class<?>...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder mediaType(MediaType value)  {
+		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder dictionary(Object...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanClasses(java.lang.Class<?>...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder dictionaryReplace(Class<?>...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanClasses(Object...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder dictionaryReplace(Object...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> HtmlSerializerBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> HtmlSerializerBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanPackages(Object...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanPackages(String...values)  {
+		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreInvocationExceptionsOnGetters() {
-		super.ignoreInvocationExceptionsOnGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreInvocationExceptionsOnSetters() {
-		super.ignoreInvocationExceptionsOnSetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignorePropertiesWithoutSetters(boolean value) {
-		super.ignorePropertiesWithoutSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreTransientFields(boolean value) {
-		super.ignoreTransientFields(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder pojoSwaps(java.lang.Class<?>...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder pojoSwaps(Object...values)  {
+		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
-		super.ignoreUnknownNullBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
-		super.implClass(interfaceClass, implClass);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder implClasses(Map<String,Class<?>> values) {
-		super.implClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder pojoSwapsReplace(Object...values)  {
+		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder locale(Locale value) {
-		super.locale(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder mediaType(MediaType value) {
-		super.mediaType(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanClasses(Class<?>...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder sortProperties(boolean value)  {
+		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanClasses(Object...values) {
-		super.notBeanClasses(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder useEnumNames(boolean value)  {
+		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanPackages(Object...values) {
-		super.notBeanPackages(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public HtmlSerializerBuilder useJavaBeanIntrospector(boolean value)  {
+		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanPackages(String...values) {
-		super.notBeanPackages(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public HtmlSerializerBuilder detectRecursions()  {
+		super.detectRecursions();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public HtmlSerializerBuilder detectRecursions(boolean value)  {
+		super.detectRecursions(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public HtmlSerializerBuilder ignoreRecursions()  {
+		super.ignoreRecursions();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public HtmlSerializerBuilder ignoreRecursions(boolean value)  {
+		super.ignoreRecursions(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public HtmlSerializerBuilder initialDepth(int value)  {
+		super.initialDepth(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder pojoSwaps(Class<?>...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - BeanTraverseBuilder */
+	public HtmlSerializerBuilder maxDepth(int value)  {
+		super.maxDepth(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder pojoSwaps(Object...values) {
-		super.pojoSwaps(values);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder addBeanTypes()  {
+		super.addBeanTypes();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder pojoSwapsReplace(Class<?>...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder addBeanTypes(boolean value)  {
+		super.addBeanTypes(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder pojoSwapsReplace(Object...values) {
-		super.pojoSwapsReplace(values);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder addRootType()  {
+		super.addRootType();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder addRootType(boolean value)  {
+		super.addRootType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder listener(Class<? extends org.apache.juneau.serializer.SerializerListener> value)  {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder sortProperties(boolean value) {
-		super.sortProperties(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder sortCollections()  {
+		super.sortCollections();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder sortCollections(boolean value)  {
+		super.sortCollections(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder sortMaps()  {
+		super.sortMaps();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder useEnumNames(boolean value) {
-		super.useEnumNames(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder sortMaps(boolean value)  {
+		super.sortMaps(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder trimEmptyCollections()  {
+		super.trimEmptyCollections();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder trimEmptyCollections(boolean value)  {
+		super.trimEmptyCollections(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder useJavaBeanIntrospector(boolean value) {
-		super.useJavaBeanIntrospector(value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder trimEmptyMaps()  {
+		super.trimEmptyMaps();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder trimEmptyMaps(boolean value)  {
+		super.trimEmptyMaps(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder trimNullProperties(boolean value)  {
+		super.trimNullProperties(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder trimStrings()  {
+		super.trimStrings();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder trimStrings(boolean value)  {
+		super.trimStrings(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder uriContext(String value)  {
+		super.uriContext(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder uriContext(UriContext value)  {
+		super.uriContext(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder uriRelativity(String value)  {
+		super.uriRelativity(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder uriRelativity(UriRelativity value)  {
+		super.uriRelativity(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder uriResolution(String value)  {
+		super.uriResolution(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder applyAnnotations(Class<?>...fromClasses) {
-		super.applyAnnotations(fromClasses);
+	@Override /* GENERATED - SerializerBuilder */
+	public HtmlSerializerBuilder uriResolution(UriResolution value)  {
+		super.uriResolution(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public HtmlSerializerBuilder applyAnnotations(Method...fromMethods) {
-		super.applyAnnotations(fromMethods);
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder fileCharset(Charset value)  {
+		super.fileCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder maxIndent(int value)  {
+		super.maxIndent(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder quoteChar(char value)  {
+		super.quoteChar(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder sq()  {
+		super.sq();
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder streamCharset(Charset value)  {
+		super.streamCharset(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder useWhitespace()  {
+		super.useWhitespace();
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder useWhitespace(boolean value)  {
+		super.useWhitespace(value);
+		return this;
+	}
+
+	@Override /* GENERATED - WriterSerializerBuilder */
+	public HtmlSerializerBuilder ws()  {
+		super.ws();
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder addNamespaceUrisToRoot()  {
+		super.addNamespaceUrisToRoot();
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder addNamespaceUrisToRoot(boolean value)  {
+		super.addNamespaceUrisToRoot(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder autoDetectNamespaces(boolean value)  {
+		super.autoDetectNamespaces(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder defaultNamespace(String value)  {
+		super.defaultNamespace(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder enableNamespaces()  {
+		super.enableNamespaces();
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder enableNamespaces(boolean value)  {
+		super.enableNamespaces(value);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder namespaces(String...values)  {
+		super.namespaces(values);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder namespaces(Namespace...values)  {
+		super.namespaces(values);
+		return this;
+	}
+
+	@Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder ns()  {
+		super.ns();
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder xsNamespace(String value)  {
+		super.xsNamespace(value);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - XmlSerializerBuilder */
+	public HtmlSerializerBuilder xsNamespace(Namespace value)  {
+		super.xsNamespace(value);
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
 	// </CONFIGURATION-PROPERTIES>
 	//------------------------------------------------------------------------------------------------------------------
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
index f7273df..7bf4b28 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
@@ -13,6 +13,7 @@
 package org.apache.juneau.jso;
 
 import java.lang.annotation.*;
+import java.lang.reflect.*;
 import java.util.*;
 
 import org.apache.juneau.*;
@@ -53,651 +54,727 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
-
-	@Override /* InputStreamParserBuilder */
-	public JsoParserBuilder binaryFormat(BinaryFormat value) {
-		super.binaryFormat(value);
-		return this;
-	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder autoCloseStreams(boolean value) {
-		super.autoCloseStreams(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder autoCloseStreams() {
-		super.autoCloseStreams();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder debugOutputLines(int value) {
-		super.debugOutputLines(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder strict(boolean value) {
-		super.strict(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder strict() {
-		super.strict();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder unbuffered(boolean value) {
-		super.unbuffered(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
 
-	@Override /* ParserBuilder */
-	public JsoParserBuilder unbuffered() {
-		super.unbuffered();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoParserBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder annotations(Annotation...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder annotations(Annotation...values)  {
 		super.annotations(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanClassVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanClassVisibility(Visibility value)  {
 		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanConstructorVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanConstructorVisibility(Visibility value)  {
 		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoParserBuilder beanDictionary(Class<?>...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanDictionary(java.lang.Class<?>...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoParserBuilder beanDictionary(Object...values) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanDictionary(Object...values)  {
 		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoParserBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoParserBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoParserBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoParserBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanFieldVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanFieldVisibility(Visibility value)  {
 		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanFilters(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanFilters(java.lang.Class<?>...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanFilters(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanFilters(Object...values)  {
 		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanMethodVisibility(Visibility value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanMethodVisibility(Visibility value)  {
 		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beansRequireDefaultConstructor() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beansRequireDefaultConstructor()  {
 		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beansRequireSerializable() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beansRequireSerializable()  {
 		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beansRequireSettersForGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beansRequireSettersForGetters()  {
 		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder debug() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder debug()  {
 		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder dictionary(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder debug(boolean value)  {
+		super.debug(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder dictionary(java.lang.Class<?>...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder dictionary(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder dictionary(Object...values)  {
 		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder dictionaryReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder dictionaryReplace(java.lang.Class<?>...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder dictionaryReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder dictionaryReplace(Object...values)  {
 		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> JsoParserBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> JsoParserBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> JsoParserBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> JsoParserBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder fluentSetters()  {
+		super.fluentSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreInvocationExceptionsOnGetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreInvocationExceptionsOnGetters()  {
 		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreInvocationExceptionsOnSetters() {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreInvocationExceptionsOnSetters()  {
 		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignorePropertiesWithoutSetters(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignorePropertiesWithoutSetters(boolean value)  {
 		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreTransientFields(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreTransientFields(boolean value)  {
 		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder ignoreUnknownNullBeanProperties(boolean value)  {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
 		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder implClasses(Map<String,Class<?>> values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder implClasses(Map<String,Class<?>> values)  {
 		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder locale(Locale value) {
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
+		return this;
+	}
+
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder locale(Locale value)  {
 		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder mediaType(MediaType value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder mediaType(MediaType value)  {
 		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanClasses(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanClasses(java.lang.Class<?>...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanClasses(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanClasses(Object...values)  {
 		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanClassesReplace(Class<?>...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanClassesRemove(java.lang.Class<?>...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanClassesReplace(Object...values) {
-		super.notBeanClassesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanClassesRemove(Object...values)  {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanClassesRemove(Class<?>...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanClassesReplace(java.lang.Class<?>...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanClassesReplace(Object...values)  {
+		super.notBeanClassesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanPackages(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanPackages(Object...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanPackages(String...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanPackages(String...values)  {
 		super.notBeanPackages(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanPackagesReplace(String...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanPackagesRemove(Object...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanPackagesReplace(Object...values) {
-		super.notBeanPackagesReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanPackagesRemove(String...values)  {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanPackagesRemove(String...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanPackagesReplace(Object...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder notBeanPackagesReplace(String...values)  {
+		super.notBeanPackagesReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder pojoSwaps(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder pojoSwaps(java.lang.Class<?>...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder pojoSwaps(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder pojoSwaps(Object...values)  {
 		super.pojoSwaps(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder pojoSwapsReplace(Class<?>...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder pojoSwapsRemove(java.lang.Class<?>...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder pojoSwapsRemove(Object...values)  {
+		super.pojoSwapsRemove(values);
+		return this;
+	}
+
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder pojoSwapsReplace(java.lang.Class<?>...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder pojoSwapsReplace(Object...values) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder pojoSwapsReplace(Object...values)  {
 		super.pojoSwapsReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder pojoSwapsRemove(Class<?>...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder propertyNamer(Class<? extends org.apache.juneau.PropertyNamer> value)  {
+		super.propertyNamer(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder sortProperties()  {
+		super.sortProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder sortProperties(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder sortProperties(boolean value)  {
 		super.sortProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder sortProperties() {
-		super.sortProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder timeZone(TimeZone value)  {
+		super.timeZone(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder timeZone(TimeZone value) {
-		super.timeZone(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder useEnumNames()  {
+		super.useEnumNames();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder useEnumNames(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder useEnumNames(boolean value)  {
 		super.useEnumNames(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder useEnumNames() {
-		super.useEnumNames();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder useInterfaceProxies(boolean value)  {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder useJavaBeanIntrospector()  {
+		super.useJavaBeanIntrospector();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder useJavaBeanIntrospector(boolean value) {
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoParserBuilder useJavaBeanIntrospector(boolean value)  {
 		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoParserBuilder useJavaBeanIntrospector() {
-		super.useJavaBeanIntrospector();
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder autoCloseStreams()  {
+		super.autoCloseStreams();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public JsoParserBuilder set(String name, Object value) {
-		super.set(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder autoCloseStreams(boolean value)  {
+		super.autoCloseStreams(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public JsoParserBuilder set(Map<String,Object> properties) {
-		super.set(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder debugOutputLines(int value)  {
+		super.debugOutputLines(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public JsoParserBuilder add(Map<String,Object> properties) {
-		super.add(properties);
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder listener(Class<? extends org.apache.juneau.parser.ParserListener> value)  {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public JsoParserBuilder addTo(String name, Object value) {
-		super.addTo(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder strict()  {
+		super.strict();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public JsoParserBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder strict(boolean value)  {
+		super.strict(value);
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public JsoParserBuilder removeFrom(String name, Object value) {
-		super.removeFrom(name, value);
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder trimStrings()  {
+		super.trimStrings();
 		return this;
 	}
 
-	@Override /* ContextBuilder */
-	public JsoParserBuilder apply(PropertyStore copyFrom) {
-		super.apply(copyFrom);
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder trimStrings(boolean value)  {
+		super.trimStrings(value);
 		return this;
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
-	// </CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder unbuffered()  {
+		super.unbuffered();
+		return this;
+	}
+
+	@Override /* GENERATED - ParserBuilder */
+	public JsoParserBuilder unbuffered(boolean value)  {
+		super.unbuffered(value);
+		return this;
+	}
 
-	@Override
-	public JsoParserBuilder applyAnnotations(AnnotationList al, VarResolverSession vrs) {
-		super.applyAnnotations(al, vrs);
+	@Override /* GENERATED - InputStreamParserBuilder */
+	public JsoParserBuilder binaryFormat(String value)  {
+		super.binaryFormat(value);
 		return this;
 	}
+
+	@Override /* GENERATED - InputStreamParserBuilder */
+	public JsoParserBuilder binaryFormat(BinaryFormat value)  {
+		super.binaryFormat(value);
+		return this;
+	}
+
+	// </CONFIGURATION-PROPERTIES>
+	//------------------------------------------------------------------------------------------------------------------
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
index c3f8b50..e71ea53 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
@@ -54,752 +54,835 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// <CONFIGURATION-PROPERTIES>
-	//------------------------------------------------------------------------------------------------------------------
 
-	@Override /* OutputStreamSerializerBuilder */
-	public JsoSerializerBuilder binaryFormat(BinaryFormat value) {
-		super.binaryFormat(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder add(Map<String,Object> properties)  {
+		super.add(properties);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder addBeanTypes(boolean value) {
-		super.addBeanTypes(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder addTo(String name, Object value)  {
+		super.addTo(name, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder addBeanTypes() {
-		super.addBeanTypes();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder addTo(String name, String key, Object value)  {
+		super.addTo(name, key, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder addRootType(boolean value) {
-		super.addRootType(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder apply(PropertyStore copyFrom)  {
+		super.apply(copyFrom);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder addRootType() {
-		super.addRootType();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder applyAnnotations(java.lang.Class<?>...fromClasses)  {
+		super.applyAnnotations(fromClasses);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder detectRecursions(boolean value) {
-		super.detectRecursions(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder applyAnnotations(Method...fromMethods)  {
+		super.applyAnnotations(fromMethods);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder detectRecursions() {
-		super.detectRecursions();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder applyAnnotations(AnnotationList al, VarResolverSession r)  {
+		super.applyAnnotations(al, r);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder ignoreRecursions(boolean value) {
-		super.ignoreRecursions(value);
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder removeFrom(String name, Object value)  {
+		super.removeFrom(name, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder ignoreRecursions() {
-		super.ignoreRecursions();
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder set(Map<String,Object> properties)  {
+		super.set(properties);
 		return this;
 	}
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+
+	@Override /* GENERATED - ContextBuilder */
+	public JsoSerializerBuilder set(String name, Object value)  {
+		super.set(name, value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder annotations(Annotation...values)  {
+		super.annotations(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanClassVisibility(Visibility value)  {
+		super.beanClassVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanConstructorVisibility(Visibility value)  {
+		super.beanConstructorVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder sortCollections() {
-		super.sortCollections();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanDictionary(java.lang.Class<?>...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanDictionary(Object...values)  {
+		super.beanDictionary(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder sortMaps() {
-		super.sortMaps();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanDictionaryRemove(java.lang.Class<?>...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimEmptyCollections(boolean value) {
-		super.trimEmptyCollections(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanDictionaryRemove(Object...values)  {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimEmptyCollections() {
-		super.trimEmptyCollections();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanDictionaryReplace(java.lang.Class<?>...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimEmptyMaps(boolean value) {
-		super.trimEmptyMaps(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanDictionaryReplace(Object...values)  {
+		super.beanDictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimEmptyMaps() {
-		super.trimEmptyMaps();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanFieldVisibility(Visibility value)  {
+		super.beanFieldVisibility(value);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanFilters(java.lang.Class<?>...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanFilters(Object...values)  {
+		super.beanFilters(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimStrings() {
-		super.trimStrings();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanFiltersRemove(java.lang.Class<?>...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanFiltersRemove(Object...values)  {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder uriRelativity(UriRelativity value) {
-		super.uriRelativity(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanFiltersReplace(java.lang.Class<?>...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanFiltersReplace(Object...values)  {
+		super.beanFiltersReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder annotations(Annotation...values) {
-		super.annotations(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanMapPutReturnsOldValue()  {
+		super.beanMapPutReturnsOldValue();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanClassVisibility(Visibility value) {
-		super.beanClassVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanMapPutReturnsOldValue(boolean value)  {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanConstructorVisibility(Visibility value) {
-		super.beanConstructorVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanMethodVisibility(Visibility value)  {
+		super.beanMethodVisibility(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoSerializerBuilder beanDictionary(Class<?>...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beanTypePropertyName(String value)  {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoSerializerBuilder beanDictionary(Object...values) {
-		super.beanDictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beansRequireDefaultConstructor()  {
+		super.beansRequireDefaultConstructor();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoSerializerBuilder beanDictionaryReplace(Class<?>...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beansRequireDefaultConstructor(boolean value)  {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoSerializerBuilder beanDictionaryReplace(Object...values) {
-		super.beanDictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beansRequireSerializable()  {
+		super.beansRequireSerializable();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoSerializerBuilder beanDictionaryRemove(Class<?>...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beansRequireSerializable(boolean value)  {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	@Deprecated
-	public JsoSerializerBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beansRequireSettersForGetters()  {
+		super.beansRequireSettersForGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanFieldVisibility(Visibility value) {
-		super.beanFieldVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beansRequireSettersForGetters(boolean value)  {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanFilters(Class<?>...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder beansRequireSomeProperties(boolean value)  {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanFilters(Object...values) {
-		super.beanFilters(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpi(Map<String,String> values)  {
+		super.bpi(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanFiltersReplace(Class<?>...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpi(Class<?> beanClass, String properties)  {
+		super.bpi(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanFiltersReplace(Object...values) {
-		super.beanFiltersReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpi(String beanClassName, String properties)  {
+		super.bpi(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanFiltersRemove(Class<?>...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpro(Map<String,String> values)  {
+		super.bpro(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpro(Class<?> beanClass, String properties)  {
+		super.bpro(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpro(String beanClassName, String properties)  {
+		super.bpro(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanMapPutReturnsOldValue() {
-		super.beanMapPutReturnsOldValue();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpwo(Map<String,String> values)  {
+		super.bpwo(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanMethodVisibility(Visibility value) {
-		super.beanMethodVisibility(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpwo(Class<?> beanClass, String properties)  {
+		super.bpwo(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpwo(String beanClassName, String properties)  {
+		super.bpwo(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beansRequireDefaultConstructor() {
-		super.beansRequireDefaultConstructor();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpx(Map<String,String> values)  {
+		super.bpx(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpx(Class<?> beanClass, String properties)  {
+		super.bpx(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beansRequireSerializable() {
-		super.beansRequireSerializable();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder bpx(String beanClassName, String properties)  {
+		super.bpx(beanClassName, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder debug()  {
+		super.debug();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beansRequireSettersForGetters() {
-		super.beansRequireSettersForGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder debug(boolean value)  {
+		super.debug(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder dictionary(java.lang.Class<?>...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder dictionary(Object...values)  {
+		super.dictionary(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpi(Class<?> beanClass, String value) {
-		super.bpi(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder dictionaryRemove(java.lang.Class<?>...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpi(Map<String,String> values) {
-		super.bpi(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder dictionaryRemove(Object...values)  {
+		super.dictionaryRemove(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpi(String beanClassName, String value) {
-		super.bpi(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder dictionaryReplace(java.lang.Class<?>...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpx(Class<?> beanClass, String properties) {
-		super.bpx(beanClass, properties);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder dictionaryReplace(Object...values)  {
+		super.dictionaryReplace(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpx(Map<String,String> values) {
-		super.bpx(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> JsoSerializerBuilder example(Class<T> pojoClass, T o)  {
+		super.example(pojoClass, o);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpx(String beanClassName, String value) {
-		super.bpx(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public <T> JsoSerializerBuilder exampleJson(Class<T> pojoClass, String json)  {
+		super.exampleJson(pojoClass, json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpro(Class<?> beanClass, String value) {
-		super.bpro(beanClass, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder examples(String json)  {
+		super.examples(json);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpro(Map<String,String> values) {
-		super.bpro(values);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder excludeProperties(Map<String,String> values)  {
+		super.excludeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpro(String beanClassName, String value) {
-		super.bpro(beanClassName, value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder excludeProperties(Class<?> beanClass, String properties)  {
+		super.excludeProperties(beanClass, properties);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpwo(Class<?> beanClass, String properties) {
-		super.bpwo(beanClass, properties);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder excludeProperties(String beanClassName, String value)  {
+		super.excludeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpwo(Map<String,String> values) {
-		super.bpwo(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder fluentSetters()  {
+		super.fluentSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder bpwo(String beanClassName, String value) {
-		super.bpwo(beanClassName, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder fluentSetters(boolean value)  {
+		super.fluentSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder debug() {
-		super.debug();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreInvocationExceptionsOnGetters()  {
+		super.ignoreInvocationExceptionsOnGetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder dictionary(Class<?>...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder dictionary(Object...values) {
-		super.dictionary(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreInvocationExceptionsOnSetters()  {
+		super.ignoreInvocationExceptionsOnSetters();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder dictionaryReplace(Class<?>...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value)  {
+		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder dictionaryReplace(Object...values) {
-		super.dictionaryReplace(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignorePropertiesWithoutSetters(boolean value)  {
+		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder dictionaryRemove(Class<?>...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreTransientFields(boolean value)  {
+		super.ignoreTransientFields(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder dictionaryRemove(Object...values) {
-		super.dictionaryRemove(values);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreUnknownBeanProperties()  {
+		super.ignoreUnknownBeanProperties();
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> JsoSerializerBuilder example(Class<T> c, T o) {
-		super.example(c, o);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreUnknownBeanProperties(boolean value)  {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public <T> JsoSerializerBuilder exampleJson(Class<T> c, String value) {
-		super.exampleJson(c, value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder ignoreUnknownNullBeanProperties(boolean value)  {
+		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder implClass(Class<?> interfaceClass, Class<?> implClass)  {
+		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreInvocationExceptionsOnGetters() {
-		super.ignoreInvocationExceptionsOnGetters();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder implClasses(Map<String,Class<?>> values)  {
+		super.implClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder includeProperties(Map<String,String> values)  {
+		super.includeProperties(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreInvocationExceptionsOnSetters() {
-		super.ignoreInvocationExceptionsOnSetters();
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder includeProperties(Class<?> beanClass, String value)  {
+		super.includeProperties(beanClass, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignorePropertiesWithoutSetters(boolean value) {
-		super.ignorePropertiesWithoutSetters(value);
+	@Deprecated @Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder includeProperties(String beanClassName, String value)  {
+		super.includeProperties(beanClassName, value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreTransientFields(boolean value) {
-		super.ignoreTransientFields(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder locale(Locale value)  {
+		super.locale(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder mediaType(MediaType value)  {
+		super.mediaType(value);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreUnknownBeanProperties() {
-		super.ignoreUnknownBeanProperties();
+	@Override /* GENERATED - BeanContextBuilder */
+	public JsoSerializerBuilder notBeanClasses(java.lang.Class<?>...values)  {
+		super.notBeanClasses(values);
 		return this;
 	}
 
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
-		super.ignoreUnknownNullBeanProperties(value);
... 26482 lines suppressed ...