Updated conf changes and docs