Improve macro definitions