Added string mappings to commands. Less leaky.