Added type support