Moved more stuff to Configuration.pm