refactored iso lookup to eliminate extra calls and use interfaces