Prepare command to pick up all possible items
Refactor some obscure client commands