Added type verification