FORGE-1155: Using new Aesh API