Moves hybrid map logic to helper