Added persistence layer