Updated API to be more consistently based on resolving for a particular type, given a sub-type