adding hirb and wirb support