ID generator-related updates