1) Add config 
2) Refactor spouts