Added system version macros