Added config, and Javadoc