Starting to replace map configuration classes with something more simple