Changes to id generation