Added cli interpreter lookups.