Added persistence and configuration