Generalized refactor, switched to a configuration system