Decouple update-group aspects of vsites and constraints