More Heroes support, adds #22