Added subtype specs.