Add thread safety to road map