Improve general architecture
Improve conf to allow fast configuration