Move resolution method off public API