- Added ConfigExtractor and updated factories
- Unit tests