Modify command selection