Tweaked database schema to accomodate initial state tracking