More Border map updates