Updated to support trusty