types: Add 30 and 31 with more scope coverage.