Added support for generating an object id