Huge update to uuid support.