changed: make use of the command handler trait