Changed scoped object infrastructure.