More refactoring
Decoupled form handler from storage; externalizing model exceptions