Add in auto increment + aggregate key

Relies on Fizz 1.5.0