Added dynamic id gens