added null type support