Added support for changing saved destination UID.
- More consistency changes