Added type checking flag