Added more leaniency on type validator