Adds Untrusted to fix #23