Changed logic of properties updating