Added type validator