Added density and moved type.