add persistence
remove other classes