Beefing up mapping commands