Changed configuration code a bit to allow for easier undefined defaults.