Add hirb and sort