More options loaded from environment variables and new config layout.