improve map command