Add define optimization