Moved all configuration to a single table