Refactor peristence
Merge branch 'platypus-fix' of github.com:premium-minds/billy into platypus-fix