Rewrote configuration setup