Configuration system added