Small update to ID generation