Added context save with blocks.