Made the country code constraint optional; better doc