Static methods on XidGenerator changed to non-static