Fix javadoc
Refactor configuration