Utsab, BalajiN | Refactoring. Seperating out persistence logic from mapping logic