overhaul entry id generation