Prepared for 1.8 (UUID)