Added several additional command mappings