Fix initial state bug
Add bulk insert