Minor changes
Unique safe key for each object