changed Id generator