Update id generation annotations to make them more portable