Improve conf
Add improvements