Further refactor of register birth and death abroad