Refactor and add fugitive map