- adding change-detection + according object-infrastructure