Improve define