Adds safer auto increment