Persistent data managment refactoring
Add my vendor namespace