Persistence added as interface and impl