Initial state data size improvement