Changes to version handling