Made Matrix types non-atomic