Updated DimensionGuard