Improve ChiliPeppr integration