Need to refactor package
Seperate persisters removed
No default constructor