Add comments and new version id