Added type to composite components