Use new behavior macro everywhere