Factor out old number support