Improvements to `get_heroes`