- Fixed the factory, now uses a map instead of a sorted vector. This is more stable and has the same performance.