Improve macro