Updated nearly every file to support multiple subtype analysis.