Added separate convert_to_domestic field

Added convert_to_domestic field incase need to convert to domestic
without replacing the sate