Safe objects everywhere
some type changes