Restructured map import