added map, wokring on visitor-list-item, rename !!module-name!! to !!module!!