Added version preprocessor stuff