Merged config with definition, added javadoc