Add Answer subtypes; rename namespaces