Optimizations to new attribute system.  Add new upgrade items to Safe.