Add other variants to assert and build barrier