Rework the MapFactory, add missing Step and Path builder