Refactoring done and configuration changed.