For Persistence manager
Merge branch 'master' of https://github.com/Shoury/god-father