Refactor map import
Fix item regex