Enhancing the Version Oriented Model