Switch to using the simpler id creator