Adding deviceActor support