Fixed the way that configuration is handled