Allow organism and subtypes to be optional.