Improved versionable map with annotations for java2sdg