Moved configuration to runtime