Fixes #103 Refactor PersistenceManager & Batch hierarchy design