Area refactoring and Persistence bugfix