Start fixing for wrong update architecture