Handle subtypes in more places