Atomic m2m support