Change id generation