[MRG] Object improvements