add 3xxxx class support