reorganizing based on review comments, replace HostCommand with Command