Rewrite configuration
Refactoring
Refacotring