Re-factored persisted blocks.
Started re-factoring statistics objects.