Persistence and Installation improved