Update entities. Add CharmService. Add persistence