Added persistence and DS configuration