Improved IdentifierGenerator