Started to add JavaDocs
Use full name for Configuration