Expand the command handler