Large update for Chicken use macros