Updated: Switch to new version scheme