Use version variables for easier upgrading