Change API to support remote command