Replaced passing 'version' from struct with macro