Removed dependency on /tmp