Add heroru support