Checkpoint
Static data checkpoint
More polish