Use macros, add version numbers