add for remote-class