Added type indicators