Added transient functionality (untested)