Removed trace and fixed the custom id generation feature