Add support for diverter mechanic