Added type-casting