Updated to support UUID's.