Removing map-based model factory method
Support for enum values
Support for map-based configuration reading; new tests.