Merged (the rest of) the Configuration.pm cration by ktrask