Partially factored out uidat into a field in commondat