Get rid of constant redefinition warnings
Refactor code to support separate handling of minor and major version updates.