Add account persistence
Add masse
Merge origin/master