Update version number
Refactor id set