Updated thrift definition