move carrier lookup to own package