Refactor: Moved logic for updating map state following engine reset to Map