Adding support for to and from device in annotations