Add version with helper macro