Refactored configuration to account for timing issues while loading. (#1)