Updated conf stuff