Improvements on `get_heroes`