Added Map operator
Fix DIC and run command