Improvements to the Forms Module Persistence Layer

<placeholder title>

Useful References