Config 

Refactor config