Use Java source level 1.6
Fixed a Javadoc
Adds ConditionalInstantiator to instantiate classes that may or may not exist