Adding configs, not stable yet