Modify library to support our own ID generation scheme.