The name is a no-go. There doesn't seem to be a map anymore, can the classes be combined?