Added id generation code to bundle as with other modules